Revert c/s 7626 -- it's missing a new file.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py
index a429852788c7be0a18d782647aa889ba042fec0c..3c0532645c28b9fb7099b98384ca48ad380ef3ad 100644 (file)
--- a/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@ -492,40 +492,6 @@ class XendDomain:
         except Exception, ex:
             raise XendError(str(ex))
 
-    def domain_ioport_range_enable(self, domid, first, last):
-        """Enable access to a range of IO ports for a domain
-
-        @param first: first IO port
-        @param last: last IO port
-        @return: 0 on success, -1 on error
-        """
-        dominfo = self.domain_lookup(domid)
-        nr_ports = last - first + 1
-        try:
-            return xc.domain_ioport_permission(dominfo.getDomid(),
-                                               first_port = first,
-                                               nr_ports = nr_ports,
-                                               allow_access = 1)
-        except Exception, ex:
-            raise XendError(str(ex))
-
-    def domain_ioport_range_disable(self, domid, first, last):
-        """Disable access to a range of IO ports for a domain
-
-        @param first: first IO port
-        @param last: last IO port
-        @return: 0 on success, -1 on error
-        """
-        dominfo = self.domain_lookup(domid)
-        nr_ports = last - first + 1
-        try:
-            return xc.domain_ioport_permission(dominfo.getDomid(),
-                                               first_port = first,
-                                               nr_ports = nr_ports,
-                                               allow_access = 0)
-        except Exception, ex:
-            raise XendError(str(ex))
-
 
 def instance():
     """Singleton constructor. Use this instead of the class constructor.

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index f8ccc0d14ef92eb7aba3b372cc0cc6bacdb998cf..7e2199ec6e4be58d926f128f87825d80cbbd6fad 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -1400,10 +1400,9 @@ def addControllerClass(device_class, cls):
     controllerClasses[device_class] = cls
 
 
-from xen.xend.server import blkif, netif, tpmif, pciif, iopif, usbif
+from xen.xend.server import blkif, netif, tpmif, pciif, usbif
 addControllerClass('vbd',  blkif.BlkifController)
 addControllerClass('vif',  netif.NetifController)
 addControllerClass('vtpm', tpmif.TPMifController)
 addControllerClass('pci',  pciif.PciController)
-addControllerClass('ioports', iopif.IOPortsController)
 addControllerClass('usb',  usbif.UsbifController)

diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index c73d66c2f933f94766a55a36d666a741dfc49686..d844b2044c0a4514cd740f69712c04988abfe89e 100644 (file)
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -241,12 +241,6 @@ gopts.var('pci', val='BUS,DEV,FUNC',
          For example '-pci c0,02,1a'.
          The option may be repeated to add more than one pci device.""")
 
-gopts.var('ioports', val='FROM[-TO]',
-          fn=append_value, default=[],
-          use="""Add a legacy I/O range to a domain, using given params (in hex).
-         For example '-ioports 02f8-02ff'.
-         The option may be repeated to add more than one i/o range.""")
-
 gopts.var('usb', val='PATH',
           fn=append_value, default=[],
           use="""Add a physical USB port to a domain, as specified by the path
@@ -445,13 +439,6 @@ def configure_pci(config_devs, vals):
         config_pci = ['pci', ['bus', bus], ['dev', dev], ['func', func]]
         config_devs.append(['device', config_pci])
 
-def configure_ioports(config_devs, vals):
-    """Create the config for legacy i/o ranges.
-    """
-    for (io_from, io_to) in vals.ioports:
-        config_ioports = ['ioports', ['from', io_from], ['to', io_to]]
-        config_devs.append(['device', config_ioports])
-
 def configure_usb(config_devs, vals):
     for path in vals.usb:
         config_usb = ['usb', ['path', path]]
@@ -624,7 +611,6 @@ def make_config(vals):
     config_devs = []
     configure_disks(config_devs, vals)
     configure_pci(config_devs, vals)
-    configure_ioports(config_devs, vals)
     configure_vifs(config_devs, vals)
     configure_usb(config_devs, vals)
     configure_vtpm(config_devs, vals)
@@ -659,20 +645,6 @@ def preprocess_pci(vals):
         pci.append(hexd)
     vals.pci = pci
 
-def preprocess_ioports(vals):
-    if not vals.ioports: return
-    ioports = []
-    for v in vals.ioports:
-        d = v.split('-')
-        if len(d) < 1 || len(d) > 2:
-            err('Invalid i/o port range specifier: ' + v)
-        if len(d) == 1:
-            d.append(d[0])
-        # Components are in hex: add hex specifier.
-        hexd = map(lambda v: '0x'+v, d)
-        ioports.append(hexd)
-    vals.ioports = ioports
-        
 def preprocess_vifs(vals):
     if not vals.vif: return
     vifs = []
@@ -805,7 +777,6 @@ def preprocess(vals):
         err("No kernel specified")
     preprocess_disk(vals)
     preprocess_pci(vals)
-    preprocess_ioports(vals)
     preprocess_vifs(vals)
     preprocess_ip(vals)
     preprocess_nfs(vals)